From 30f174ca3608a3d08c22900ec0ca113a32bfd611 Mon Sep 17 00:00:00 2001 From: "Ian.Campbell@xensource.com" Date: Wed, 22 Feb 2006 17:26:39 +0000 Subject: [PATCH] Fix x86_64 Xen build. event_callback_cs and failsafe_callback_cs are x86_32 only. Signed-off-by: Ian Campbell --- xen/arch/x86/domain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1c083fcb67..7584201bfb 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -357,10 +357,14 @@ int arch_set_info_guest( if ( !(c->flags & VGCF_HVM_GUEST) ) { if ( ((c->user_regs.ss & 3) == 0) || - !VALID_CODESEL(c->user_regs.cs) || - !VALID_CODESEL(c->event_callback_cs) || + !VALID_CODESEL(c->user_regs.cs) ) + return -EINVAL; + +#ifdef __i386__ + if ( !VALID_CODESEL(c->event_callback_cs) || !VALID_CODESEL(c->failsafe_callback_cs) ) return -EINVAL; +#endif for ( i = 0; i < 256; i++ ) if ( !VALID_CODESEL(c->trap_ctxt[i].cs) ) -- 2.30.2